From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 6 Dec 2021 02:39:28 +0000 (-0800)
Subject: Simplify message-make-expires
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~16^2~4050^2~24
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=084f440571694ec14ea5def4191861bdb5854ea0;p=emacs.git

Simplify message-make-expires

* lisp/gnus/message.el (message-make-expires):
Use time-add instead of doing it by hand.  This also calculates the
expiration time more accurately than the old code did.
---

diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 8e7983a33c3..c2d14296f94 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -5948,12 +5948,9 @@ In posting styles use `(\"Expires\" (make-expires-date 30))'."
 
 (defun message-make-expires ()
   "Return an Expires header based on `message-expires'."
-  (let ((current (current-time))
-	(future (* 1.0 message-expires 60 60 24)))
+  (let ((future (* 60 60 24 message-expires)))
     ;; Add the future to current.
-    (setcar current (+ (car current) (round (/ future (expt 2 16)))))
-    (setcar (cdr current) (+ (nth 1 current) (% (round future) (expt 2 16))))
-    (message-make-date current)))
+    (message-make-date (time-add nil future))))
 
 (defun message-make-path ()
   "Return uucp path."